Home Explore Help
Register Sign In
J1X
/
huginn
Watch 2
Star 0
Fork 0

Browse Source
Merge remote-tracking branch 'origin/master' into scenarios

Andrew Cantino 11 years ago
parent
cd5c7060fb 44834cbbb5
commit
a43d6eae97
5 changed files with 72 additions and 54 deletions
Show Diff Stats
  1. 2 2
      Gemfile
  2. 40 40
      Gemfile.lock
  3. 2 1
      app/models/agents/mqtt_agent.rb
  4. 24 7
      app/views/devise/registrations/edit.html.erb
  5. 4 4
      db/migrate/20140603104211_rename_digest_email_to_email_digest.rb

+ 2 - 2
Gemfile
View File 

@@ -11,7 +11,7 @@ gem 'bundler', '>= 1.5.0'
11 11
12 12 
 gem 'protected_attributes', '~>1.0.7'
13 13
14 
-gem 'rails', '4.1.0'
14 
+gem 'rails', '4.1.1'
15 15
16 16 
 case RUBY_PLATFORM
17 17 
 when /freebsd/
 
@@ -68,7 +68,7 @@ gem 'twitter', '~> 5.8.0'
68 68 
 gem 'twitter-stream', github: 'cantino/twitter-stream', branch: 'master'
69 69 
 gem 'em-http-request', '~> 1.1.2'
70 70 
 gem 'weibo_2', '~> 0.1.4'
71 
-gem 'hipchat', '~> 1.1.0'
71 
+gem 'hipchat', '~> 1.2.0'
72 72 
 gem 'xmpp4r',  '~> 0.5.6'
73 73 
 gem 'slack-notifier', '~> 0.5.0'
74 74

+ 40 - 40
Gemfile.lock
View File 

@@ -12,27 +12,27 @@ GEM
12 12 
   remote: https://rubygems.org/
13 13 
   specs:
14 14 
     ace-rails-ap (2.0.1)
15 
-    actionmailer (4.1.0)
16 
-      actionpack (= 4.1.0)
17 
-      actionview (= 4.1.0)
15 
+    actionmailer (4.1.1)
16 
+      actionpack (= 4.1.1)
17 
+      actionview (= 4.1.1)
18 18 
       mail (~> 2.5.4)
19 
-    actionpack (4.1.0)
20 
-      actionview (= 4.1.0)
21 
-      activesupport (= 4.1.0)
19 
+    actionpack (4.1.1)
20 
+      actionview (= 4.1.1)
21 
+      activesupport (= 4.1.1)
22 22 
       rack (~> 1.5.2)
23 23 
       rack-test (~> 0.6.2)
24 
-    actionview (4.1.0)
25 
-      activesupport (= 4.1.0)
24 
+    actionview (4.1.1)
25 
+      activesupport (= 4.1.1)
26 26 
       builder (~> 3.1)
27 27 
       erubis (~> 2.7.0)
28 
-    activemodel (4.1.0)
29 
-      activesupport (= 4.1.0)
28 
+    activemodel (4.1.1)
29 
+      activesupport (= 4.1.1)
30 30 
       builder (~> 3.1)
31 
-    activerecord (4.1.0)
32 
-      activemodel (= 4.1.0)
33 
-      activesupport (= 4.1.0)
31 
+    activerecord (4.1.1)
32 
+      activemodel (= 4.1.1)
33 
+      activesupport (= 4.1.1)
34 34 
       arel (~> 5.0.0)
35 
-    activesupport (4.1.0)
35 
+    activesupport (4.1.1)
36 36 
       i18n (~> 0.6, >= 0.6.9)
37 37 
       json (~> 1.7, >= 1.7.7)
38 38 
       minitest (~> 5.1)
 
@@ -119,14 +119,14 @@ GEM
119 119 
     foreman (0.63.0)
120 120 
       dotenv (>= 0.7)
121 121 
       thor (>= 0.13.6)
122 
-    geokit (1.8.4)
122 
+    geokit (1.8.5)
123 123 
       multi_json (>= 1.3.2)
124 124 
     geokit-rails (2.0.1)
125 125 
       geokit (~> 1.5)
126 126 
       rails (>= 3.0)
127 127 
     hashie (2.0.5)
128 128 
     hike (1.2.3)
129 
-    hipchat (1.1.0)
129 
+    hipchat (1.2.0)
130 130 
       httparty
131 131 
     http (0.5.0)
132 132 
       http_parser.rb
 
@@ -158,16 +158,16 @@ GEM
158 158 
       thread_safe (~> 0.3, >= 0.3.1)
159 159 
     method_source (0.8.2)
160 160 
     mime-types (1.25.1)
161 
-    mini_portile (0.5.3)
162 
-    minitest (5.3.3)
161 
+    mini_portile (0.6.0)
162 
+    minitest (5.3.4)
163 163 
     mqtt (0.2.0)
164 
-    multi_json (1.9.3)
164 
+    multi_json (1.10.1)
165 165 
     multi_xml (0.5.5)
166 166 
     multipart-post (2.0.0)
167 
-    mysql2 (0.3.15)
167 
+    mysql2 (0.3.16)
168 168 
     naught (1.0.0)
169 
-    nokogiri (1.6.1)
170 
-      mini_portile (~> 0.5.0)
169 
+    nokogiri (1.6.2.1)
170 
+      mini_portile (= 0.6.0)
171 171 
     oauth2 (0.9.3)
172 172 
       faraday (>= 0.8, < 0.10)
173 173 
       jwt (~> 0.1.8)
 
@@ -175,7 +175,7 @@ GEM
175 175 
       multi_xml (~> 0.5)
176 176 
       rack (~> 1.2)
177 177 
     orm_adapter (0.5.0)
178 
-    polyglot (0.3.4)
178 
+    polyglot (0.3.5)
179 179 
     protected_attributes (1.0.7)
180 180 
       activemodel (>= 4.0.1, < 5.0)
181 181 
     pry (0.9.12.6)
 
@@ -185,22 +185,22 @@ GEM
185 185 
     rack (1.5.2)
186 186 
     rack-test (0.6.2)
187 187 
       rack (>= 1.0)
188 
-    rails (4.1.0)
189 
-      actionmailer (= 4.1.0)
190 
-      actionpack (= 4.1.0)
191 
-      actionview (= 4.1.0)
192 
-      activemodel (= 4.1.0)
193 
-      activerecord (= 4.1.0)
194 
-      activesupport (= 4.1.0)
188 
+    rails (4.1.1)
189 
+      actionmailer (= 4.1.1)
190 
+      actionpack (= 4.1.1)
191 
+      actionview (= 4.1.1)
192 
+      activemodel (= 4.1.1)
193 
+      activerecord (= 4.1.1)
194 
+      activesupport (= 4.1.1)
195 195 
       bundler (>= 1.3.0, < 2.0)
196 
-      railties (= 4.1.0)
196 
+      railties (= 4.1.1)
197 197 
       sprockets-rails (~> 2.0)
198 
-    railties (4.1.0)
199 
-      actionpack (= 4.1.0)
200 
-      activesupport (= 4.1.0)
198 
+    railties (4.1.1)
199 
+      actionpack (= 4.1.1)
200 
+      activesupport (= 4.1.1)
201 201 
       rake (>= 0.8.7)
202 202 
       thor (>= 0.18.1, < 2.0)
203 
-    rake (10.3.1)
203 
+    rake (10.3.2)
204 204 
     ref (1.0.5)
205 205 
     rest-client (1.6.7)
206 206 
       mime-types (>= 1.16)
 
@@ -236,7 +236,7 @@ GEM
236 236 
       sass (~> 3.2.0)
237 237 
       sprockets (~> 2.8, <= 2.11.0)
238 238 
       sprockets-rails (~> 2.0)
239 
-    select2-rails (3.5.4)
239 
+    select2-rails (3.5.7)
240 240 
       thor (~> 0.14)
241 241 
     shoulda-matchers (2.6.0)
242 242 
       activesupport (>= 3.0.0)
 
@@ -264,7 +264,7 @@ GEM
264 264 
       libv8 (~> 3.16.14.0)
265 265 
       ref
266 266 
     thor (0.19.1)
267 
-    thread_safe (0.3.3)
267 
+    thread_safe (0.3.4)
268 268 
     tilt (1.4.1)
269 269 
     tins (1.1.0)
270 270 
     treetop (1.4.15)
 
@@ -287,7 +287,7 @@ GEM
287 287 
       simple_oauth (~> 0.2.0)
288 288 
     typhoeus (0.6.8)
289 289 
       ethon (>= 0.7.0)
290 
-    tzinfo (1.1.0)
290 
+    tzinfo (1.2.1)
291 291 
       thread_safe (~> 0.1)
292 292 
     uglifier (2.5.0)
293 293 
       execjs (>= 0.3.0)
 
@@ -335,7 +335,7 @@ DEPENDENCIES
335 335 
   foreman (~> 0.63.0)
336 336 
   geokit (~> 1.8.4)
337 337 
   geokit-rails (~> 2.0.1)
338 
-  hipchat (~> 1.1.0)
338 
+  hipchat (~> 1.2.0)
339 339 
   jquery-rails (~> 3.1.0)
340 340 
   json (~> 1.8.1)
341 341 
   jsonpath (~> 0.5.3)
 
@@ -348,7 +348,7 @@ DEPENDENCIES
348 348 
   protected_attributes (~> 1.0.7)
349 349 
   pry
350 350 
   rack
351 
-  rails (= 4.1.0)
351 
+  rails (= 4.1.1)
352 352 
   rr
353 353 
   rspec
354 354 
   rspec-rails

+ 2 - 1
app/models/agents/mqtt_agent.rb
View File 

@@ -85,7 +85,8 @@ module Agents
85 85 
         'cert_file' => './client.crt',
86 86 
         'key_file' => './client.key',
87 87 
         'topic' => 'huginn',
88 
-        'max_read_time' => '10'
88 
+        'max_read_time' => '10',
89 
+        'expected_update_period_in_days' => '2'
89 90 
       }
90 91 
     end
91 92

+ 24 - 7
app/views/devise/registrations/edit.html.erb
View File 

@@ -23,20 +23,23 @@
23 23 
           </div>
24 24
25 25 
           <div class="form-group">
26 
-            <%= f.label :password, :class => 'col-md-4 control-label' %>
26 
+            <%= f.label :current_password, :class => 'col-md-4 control-label' %>
27 27 
             <div class="col-md-6">
28 
-              <%= f.password_field :password, :autocomplete => "off", :class => 'form-control' %>
29 
-              <span class="help-inline">Leave blank if you don't want to change it.</span>
28 
+              <%= f.password_field :current_password, :class => 'form-control' %>
29 
+              <span class='help-inline'>We need your current password to confirm your changes.</span>
30 30 
             </div>
31 31 
           </div>
32 
-
32 
+
33 33 
           <div class="form-group">
34 
-            <%= f.label :password_confirmation, :class => 'col-md-4 control-label' %>
35 
-            <div class="col-md-6">
36 
-              <%= f.password_field :password_confirmation, :class => 'form-control' %>
34 
+            <div class="col-md-offset-4 col-md-10">
35 
+              <%= f.submit "Update", :class => "btn btn-primary" %>
37 36 
             </div>
38 37 
           </div>
38 
+        <% end %>
39 39
40 
+        <h3>Change password</h3>
41 
+        <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put, :class => 'form-horizontal' }) do |f| %>
42 
+          <%= devise_error_messages! %>
40 43 
           <div class="form-group">
41 44 
             <%= f.label :current_password, :class => 'col-md-4 control-label' %>
42 45 
             <div class="col-md-6">
 
@@ -46,6 +49,20 @@
46 49 
           </div>
47 50
48 51 
           <div class="form-group">
52 
+            <%= f.label :password, :class => 'col-md-4 control-label' %>
53 
+            <div class="col-md-6">
54 
+              <%= f.password_field :password, :autocomplete => "off", :class => 'form-control' %>
55 
+            </div>
56 
+          </div>
57 
+
58 
+          <div class="form-group">
59 
+            <%= f.label :password_confirmation, :class => 'col-md-4 control-label' %>
60 
+            <div class="col-md-6">
61 
+              <%= f.password_field :password_confirmation, :class => 'form-control' %>
62 
+            </div>
63 
+          </div>
64 
+
65 
+          <div class="form-group">
49 66 
             <div class="col-md-offset-4 col-md-10">
50 67 
               <%= f.submit "Update", :class => "btn btn-primary" %>
51 68 
             </div>

+ 4 - 4
db/migrate/20140603104211_rename_digest_email_to_email_digest.rb
View File 

@@ -2,8 +2,8 @@ class RenameDigestEmailToEmailDigest < ActiveRecord::Migration
2 2 
   def up
3 3 
     sql = <<-SQL
4 4 
       UPDATE #{ActiveRecord::Base.connection.quote_table_name('agents')}
5 
-      SET #{ActiveRecord::Base.connection.quote_column_name('type')} = "Agents::EmailDigestAgent"
6 
-      WHERE #{ActiveRecord::Base.connection.quote_column_name('type')} = "Agents::DigestEmailAgent"
5 
+      SET #{ActiveRecord::Base.connection.quote_column_name('type')} = 'Agents::EmailDigestAgent'
6 
+      WHERE #{ActiveRecord::Base.connection.quote_column_name('type')} = 'Agents::DigestEmailAgent'
7 7 
     SQL
8 8
9 9 
     execute sql
 
@@ -12,8 +12,8 @@ class RenameDigestEmailToEmailDigest < ActiveRecord::Migration
12 12 
   def down
13 13 
     sql = <<-SQL
14 14 
       UPDATE #{ActiveRecord::Base.connection.quote_table_name('agents')}
15 
-      SET #{ActiveRecord::Base.connection.quote_column_name('type')} = "Agents::DigestEmailAgent"
16 
-      WHERE #{ActiveRecord::Base.connection.quote_column_name('type')} = "Agents::EmailDigestAgent"
15 
+      SET #{ActiveRecord::Base.connection.quote_column_name('type')} = 'Agents::DigestEmailAgent'
16 
+      WHERE #{ActiveRecord::Base.connection.quote_column_name('type')} = 'Agents::EmailDigestAgent'
17 17 
     SQL
18 18
19 19 
     execute sql